//
//  ViewController.m
//  test
//
//  Created by tingxins on 5/30/16.
//  Copyright © 2016 tingxins. All rights reserved.
//

#import "ViewController.h"

@interface ViewController ()

@end

@implementation ViewController

- (void)viewDidLoad {
    [super viewDidLoad];
    
    NSLog(@"branch");
    
    NSLog(@"master");
    
    NSLog(@"master——test");
    
    NSLog(@"viewDidLoad_test————————89899");
    
    NSLog(@"222222");
    
    NSLog(@"######");
    
    NSLog(@"1111111");
    
    NSLog(@"*******_88888888");
    
    NSLog(@"合并合并");
}

- (void)didReceiveMemoryWarning {
    [super didReceiveMemoryWarning];
    // Dispose of any resources that can be recreated.
}

@end
